Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 13 Feb 2012 16:46:45 +0000 (08:46 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 13 Feb 2012 16:46:45 +0000 (08:46 -0800)
commit60cf971dcb8794d53d6472324934eb804e43072c
tree8b6a09ee4fce527cca12f17578e1fc2f740828fe
parent3e61cb85d7d8f8b20e1ad1ea1df8855afd5ff19d
parentd51273a148668703aff4f043669d409972b4d4bd
Merge from trunk.